Results of semistructured (SM) and unstructured merge (UM) in revision : conflicts (C), conflicting lines of code (CL) and semantic conflicts (SC).
Yellow boxes indicate better results of unstructured merge. CM column dislays which kind is selected for combined conflict merge.
| C | CL | SC | CM |
---|
File | UM | SM | UM | SM | UM | SM |
---|
/source/RssBandit/WinGui/Forms/WinGUIMain.cs | 15 | 13 | 61 | 165 | -- | 0 | SM |
/source/RssBandit/Core/RssBanditApplication.cs | 13 | 11 | 45 | 98 | -- | 0 | SM |
/source/NewsComponents/Feed/feeds.cs | 6 | 4 | 91 | 39 | -- | 1 | SM |
/source/NewsComponents/Search/LuceneIndexer.cs | 3 | 2 | 70 | 76 | -- | 0 | SM |
/source/NewsComponents/Search/LuceneSearch.cs | 4 | 0 | 26 | 0 | -- | 0 | SM |
/source/RssBandit/VersionInfo.cs | 1 | 0 | 6 | 0 | -- | 0 | SM |
/source/RssBandit.AppServices/VersionInfo.cs | 1 | 0 | 6 | 0 | -- | 0 | SM |
/source/NewsComponents/VersionInfo.cs | 1 | 0 | 6 | 0 | -- | 0 | SM |
/source/RssBandit/Core/RssBanditApplication.Commands.cs | 2 | 2 | 8 | 8 | -- | 0 | SM |
/source/RssBandit/Core/RssBanditApplication.EventHandlers.cs | 1 | 1 | 2 | 2 | -- | 0 | SM |
/source/NewsComponents/Core/NewsHandler.cs | 1 | 19 | 4150 | 881 | -- | 26 | UM |